shell-tray-icon: Trigger a relayout when the underneath xembeded size changes

Origin: https://gitlab.gnome.org/3v1n0/gnome-shell/-/commits/tray-offscreen-xwindows
Bug-Ubuntu: https://bugs.launchpad.net/bugs/2012388

Gbp-Pq: Topic tray-icons
Gbp-Pq: Name shell-tray-icon-Trigger-a-relayout-when-the-underneath-xe.patch

diff --git a/src/shell-tray-icon.c b/src/shell-tray-icon.c
index 9b79c2be0da6be1acbcda4d36915d1c94425cb60..c9be146edb4670ab0ac69e848ec0c6514687e197 100644 (file)
--- a/src/shell-tray-icon.c
+++ b/src/shell-tray-icon.c
@@ -260,6 +260,10 @@ shell_tray_icon_set_child (ShellTrayIcon *tray_icon,
                       "window-created",
                       G_CALLBACK (shell_tray_icon_window_created_cb),
                       tray_icon);
+
+  g_signal_connect_object (tray_child, "reconfigured",
+                           G_CALLBACK (clutter_actor_queue_relayout),
+                           tray_icon, G_CONNECT_SWAPPED);
 }
 
 /*

diff --git a/src/tray/na-xembed.c b/src/tray/na-xembed.c
index d4c389cc76ebf9af8734e579a4905ca711e4ae6d..be08d6daa431a70711caced21e527fe866f06718 100644 (file)
--- a/src/tray/na-xembed.c
+++ b/src/tray/na-xembed.c
@@ -91,6 +91,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (NaXembed, na_xembed, G_TYPE_OBJECT)
 enum {
   PLUG_ADDED,
   PLUG_REMOVED,
+  RECONFIGURED,
   LAST_SIGNAL
 };
 
@@ -548,6 +549,15 @@ xembed_filter_func (MetaX11Display *x11_display,
           }
         break;
       }
+    case ConfigureNotify:
+      {
+        XConfigureEvent *xce = &xevent->xconfigure;
+
+        if (xce->window == priv->socket_window)
+          g_signal_emit (xembed, signals[RECONFIGURED], 0);
+
+        break;
+      }
     case DestroyNotify:
       {
         XDestroyWindowEvent *xdwe = &xevent->xdestroywindow;
@@ -742,6 +752,14 @@ na_xembed_class_init (NaXembedClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
+  signals[RECONFIGURED] =
+    g_signal_new ("reconfigured",
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (NaXembedClass, reconfigured),
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
   props[PROP_X11_DISPLAY] =
     g_param_spec_object ("x11-display", NULL, NULL,
                          META_TYPE_X11_DISPLAY,

diff --git a/src/tray/na-xembed.h b/src/tray/na-xembed.h
index 271060d8348179c0e94202f7319d5d08d1a3ee36..801c6a6ba5c63fc4e1a9b39c8f15d460fd8eedda 100644 (file)
--- a/src/tray/na-xembed.h
+++ b/src/tray/na-xembed.h
@@ -35,6 +35,7 @@ struct _NaXembedClass
 
   void (* plug_added) (NaXembed *xembed);
   void (* plug_removed) (NaXembed *xembed);
+  void (* reconfigured) (NaXembed *xembed);
 };
 
 MetaX11Display * na_xembed_get_x11_display (NaXembed *xembed);